diff --git a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
index a64f8e3c7..0fd2e9047 100755
--- a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
+++ b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
@@ -155,10 +155,6 @@ public final class DescParseTickFormat
 
 		int hours = 0;
 		int minutes = 0;
-		if (desc.endsWith("pm"))
-		{
-			hours += 12;
-		}
 
 		desc = desc.toLowerCase().replaceAll("[^0-9]", "");
 
@@ -189,6 +185,16 @@ public final class DescParseTickFormat
 		{
 			throw new NumberFormatException();
 		}
+		
+		if (desc.endsWith("pm") && hours != 12)
+		{
+			hours += 12;
+		}
+		
+		if (desc.endsWith("am") && hours == 12)
+		{
+			hours -= 12;
+		}
 
 		return hoursMinutesToTicks(hours, minutes);
 	}