diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java
index 413633c472..931c51f226 100644
--- a/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java
+++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java
@@ -154,7 +154,17 @@ public abstract class Event extends LazyDeletableDomainObject
 
 	@Override
 	public int compareTo(Event other) {
-		return (int) (dueDate.getTime() - other.dueDate.getTime());
+		int dcomp = dueDate.compareTo(other.dueDate);
+		if (dcomp == 0){
+			if (id == null){
+				return -1;
+			}else if(other.id == null){
+				return 1;
+			}
+			else return id.compareTo(other.id);
+			}
+		
+		return dcomp;
 	}
 	
 	public Panel getDisplayPanel(String id){