diff --git a/build.gradle b/build.gradle
index 26f9931c1..10f8cab7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ android {
     buildToolsVersion "22.0.1"
 
     defaultConfig {
-        versionCode 371
-        versionName "4.7.15"
+        versionCode 372
+        versionName "4.7.16"
         minSdkVersion 7
         targetSdkVersion 22
     }
diff --git a/src/main/java/com/todoroo/astrid/core/SortHelper.java b/src/main/java/com/todoroo/astrid/core/SortHelper.java
index 5db37dd59..ce84983ff 100644
--- a/src/main/java/com/todoroo/astrid/core/SortHelper.java
+++ b/src/main/java/com/todoroo/astrid/core/SortHelper.java
@@ -118,7 +118,7 @@ public class SortHelper {
     }
 
     private static String adjustedDueDateFunction() {
-        return "(CASE WHEN (" + Task.DUE_DATE.name + " / 1000) % 60 > 0" + " THEN " + Task.DUE_DATE.name + " ELSE " + "(" + Task.DUE_DATE.name + " + " + (DateUtilities.ONE_HOUR * 11 + DateUtilities.ONE_MINUTE * 59) + ") END)";
+        return "(CASE WHEN (" + Task.DUE_DATE.name + " / 60000) > 0" + " THEN " + Task.DUE_DATE.name + " ELSE " + "(" + Task.DUE_DATE.name + " + " + (DateUtilities.ONE_HOUR * 11 + DateUtilities.ONE_MINUTE * 59) + ") END)";
     }
 
 }
diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java
index 0ff91ab21..8a740e7b4 100644
--- a/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -425,7 +425,10 @@ public class DeadlineControlSet extends TaskEditControlSetBase {
     protected void writeToModelAfterInitialized(Task task) {
         DateTime dateTime = newDateTime(date);
         if (time >= 0) {
-            dateTime = dateTime.withMillisOfDay(time + 1);
+            dateTime = dateTime
+                    .withMillisOfDay(time)
+                    .withSecondOfMinute(1)
+                    .withMillisOfSecond(0);
         }
         long millis = dateTime.getMillis();
         if (millis != task.getDueDate()) {