diff --git a/features/data/configs/bug153.json b/features/data/configs/bug153.json
new file mode 100644
index 00000000..ad617928
--- /dev/null
+++ b/features/data/configs/bug153.json
@@ -0,0 +1,14 @@
+{
+  "default_hour": 9,
+  "timeformat": "%Y-%m-%d %H:%M",
+  "linewrap": 80,
+  "encrypt": false,
+  "editor": "",
+  "default_minute": 0,
+  "highlight": true,
+  "password": "",
+  "journals": {
+    "default": "features/journals/bug153.dayone"
+  },
+  "tagsymbols": "@"
+}
diff --git a/features/data/journals/bug153.dayone/entries/B40EE704E15846DE8D45C44118A4D511.doentry b/features/data/journals/bug153.dayone/entries/B40EE704E15846DE8D45C44118A4D511.doentry
new file mode 100644
index 00000000..745a08df
--- /dev/null
+++ b/features/data/journals/bug153.dayone/entries/B40EE704E15846DE8D45C44118A4D511.doentry
@@ -0,0 +1,56 @@
+<?xxml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Creation Date</key>
+    <date>2013-10-27T02:27:27Z</date>
+    <key>Creator</key>
+    <dict>
+        <key>Device Agent</key>
+        <string>iPhone/iPhone3,1</string>
+        <key>Generation Date</key>
+        <date>2013-10-27T07:02:27Z</date>
+        <key>Host Name</key>
+        <string>omrt104001</string>
+        <key>OS Agent</key>
+        <string>iOS/7.0.3</string>
+        <key>Software Agent</key>
+        <string>Day One (iOS)/1.11.4</string>
+    </dict>
+    <key>Entry Text</key>
+    <string>Some text.</string>
+    <key>Location</key>
+    <dict>
+        <key>Administrative Area</key>
+        <string>Östergötlands län</string>
+        <key>Country</key>
+        <string>Sverige</string>
+        <key>Latitude</key>
+        <real>58.383400000000000</real>
+        <key>Locality</key>
+        <string>City</string>
+        <key>Longitude</key>
+        <real>15.577170000000000</real>
+        <key>Place Name</key>
+        <string>Street</string>
+    </dict>
+    <key>Starred</key>
+    <false/>
+    <key>Time Zone</key>
+    <string>Europe/Stockholm</string>
+    <key>UUID</key>
+    <string>B40EE704E15846DE8D45C44118A4D511</string>
+    <key>Weather</key>
+    <dict>
+        <key>Celsius</key>
+        <string>12</string>
+        <key>Description</key>
+        <string>Clear</string>
+        <key>Fahrenheit</key>
+        <string>54</string>
+        <key>IconName</key>
+        <string>sunnyn.png</string>
+    </dict>
+</dict>
+</plist>
diff --git a/features/regression.feature b/features/regression.feature
index af2c01f8..029c257c 100644
--- a/features/regression.feature
+++ b/features/regression.feature
@@ -20,3 +20,13 @@ Feature: Zapped bugs should stay dead.
         When we run "jrnl 2013-11-30 15:42: Project Started."
         Then we should see the message "Entry added"
         and the journal should contain "2013-11-30 15:42 Project Started."
+
+    Scenario: Loading entry with ambiguous time stamp
+        #https://github.com/maebert/jrnl/issues/153
+        Given we use the config "bug153.json"
+        When we run "jrnl -1"
+        Then we should get no error
+        and the output should be
+            """
+            2013-10-27 03:27 Some text.
+            """