diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a3899a4f5..ec223081d 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="83"
-      android:versionName="2.3.2">
+      android:versionCode="84"
+      android:versionName="2.3.3">
       
     <meta-data android:name="com.a0soft.gphone.aTrackDog.webURL"
                android:value="http://www.weloveastrid.com" />
diff --git a/src/com/timsu/astrid/activities/TaskEdit.java b/src/com/timsu/astrid/activities/TaskEdit.java
index e77d3e2c5..e8c8f310a 100644
--- a/src/com/timsu/astrid/activities/TaskEdit.java
+++ b/src/com/timsu/astrid/activities/TaskEdit.java
@@ -674,7 +674,7 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
             Long deadlineDate = null;
             if(model.getPreferredDueDate() != null)
                 deadlineDate = model.getPreferredDueDate().getTime();
-            else if(model.getDefaultValues() != null)
+            else if(model.getDefiniteDueDate() != null)
                 deadlineDate = model.getDefiniteDueDate().getTime();
 
             if(deadlineDate != null) {
diff --git a/src/com/timsu/astrid/data/task/TaskController.java b/src/com/timsu/astrid/data/task/TaskController.java
index a0ec8ce90..8146d0b29 100644
--- a/src/com/timsu/astrid/data/task/TaskController.java
+++ b/src/com/timsu/astrid/data/task/TaskController.java
@@ -282,6 +282,8 @@ public class TaskController extends AbstractController {
         if(repeatInfo != null)
             repeatModel.repeatTaskBy(context, this, repeatInfo);
         cursor.close();
+
+        Notifications.deleteAlarm(context, null, task.getTaskIdentifier().getId());
     }
 
     /** Set last notification date */