diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dea926916..0b2afef69 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="108"
-      android:versionName="2.8.3">
+      android:versionCode="110"
+      android:versionName="2.8.4">
       
     <!-- ============================ Metadata ============================ -->   
       
diff --git a/src/com/timsu/astrid/sync/SynchronizationService.java b/src/com/timsu/astrid/sync/SynchronizationService.java
index fcf922b3c..ad1941b24 100644
--- a/src/com/timsu/astrid/sync/SynchronizationService.java
+++ b/src/com/timsu/astrid/sync/SynchronizationService.java
@@ -100,12 +100,10 @@ public class SynchronizationService extends Service {
     		latestSyncMillis = lastAutoSyncDate.getTime();
     	long offset = 0;
     	if(latestSyncMillis != 0)
-    		offset = Math.min(offset, Math.max(0, latestSyncMillis + interval -
-    				System.currentTimeMillis()));
+    		offset = Math.max(0, latestSyncMillis + interval - System.currentTimeMillis());
 
     	// give a little padding
     	offset = Math.max(offset, AUTO_SYNC_MIN_OFFSET);
-    	offset = AUTO_SYNC_MIN_OFFSET;
 
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override