diff --git a/TodoListManager/bin/TodoListManager.apk b/TodoListManager/bin/TodoListManager.apk
index 95bb67d..36bc8a4 100644
Binary files a/TodoListManager/bin/TodoListManager.apk and b/TodoListManager/bin/TodoListManager.apk differ
diff --git a/TodoListManager/bin/classes.dex b/TodoListManager/bin/classes.dex
index bf84f76..5c99afb 100644
Binary files a/TodoListManager/bin/classes.dex and b/TodoListManager/bin/classes.dex differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/AddNewTodoItemActivity.class b/TodoListManager/bin/classes/il/ac/huji/todolist/AddNewTodoItemActivity.class
index cfe2f6f..bf31a78 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/AddNewTodoItemActivity.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/AddNewTodoItemActivity.class differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class
index 0e00f82..4699fb0 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity$1.class differ
diff --git a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class
index 6a2cf27..890b477 100644
Binary files a/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class and b/TodoListManager/bin/classes/il/ac/huji/todolist/TodoListManagerActivity.class differ
diff --git a/TodoListManager/src/il/ac/huji/todolist/AddNewTodoItemActivity.java b/TodoListManager/src/il/ac/huji/todolist/AddNewTodoItemActivity.java
index fbbb6e9..f49c671 100644
--- a/TodoListManager/src/il/ac/huji/todolist/AddNewTodoItemActivity.java
+++ b/TodoListManager/src/il/ac/huji/todolist/AddNewTodoItemActivity.java
@@ -1,5 +1,7 @@
 package il.ac.huji.todolist;
 
+import java.util.Date;
+
 import android.os.Bundle;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -33,7 +35,7 @@ public void add(View view) {
 		String task = edtTask.getText().toString();
 
 		DatePicker datePicker = (DatePicker) findViewById(R.id.datePicker);
-		long date = datePicker.getCalendarView().getDate();
+		Date date = new Date(datePicker.getCalendarView().getDate());
 
 		Intent returnIntent = new Intent();
 		returnIntent.putExtra("title", task);
diff --git a/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java b/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java
index 95c45bd..f9d2c4b 100644
--- a/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java
+++ b/TodoListManager/src/il/ac/huji/todolist/TodoListManagerActivity.java
@@ -3,6 +3,7 @@
 import il.ac.huji.todolist.ActionTaskDialog.DeleteTaskDialogListener;
 
 import java.util.ArrayList;
+import java.util.Date;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -104,7 +105,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		// If the request went well (OK) and the request was TASK_N_DATE
 		if (resultCode == Activity.RESULT_OK && requestCode == TASK_N_DATE) {
 			String task = data.getStringExtra("title");
-			long date = data.getLongExtra("dueDate", 0);
+			Date ddate = (Date) data.getSerializableExtra("dueDate");
+			long date = ddate.getTime();
 
 			// add the item
 			if(task != null) {