diff --git a/fuzzytime.cabal b/fuzzytime.cabal
--- a/fuzzytime.cabal
+++ b/fuzzytime.cabal
@@ -1,5 +1,5 @@
 Name:                fuzzytime
-Version:             0.4
+Version:             0.4.1
 Description:         Telling the time in a more humane way
 Synopsis:            Telling the time in a more humane way
 Category:            Utils
diff --git a/fuzzytime.hs b/fuzzytime.hs
--- a/fuzzytime.hs
+++ b/fuzzytime.hs
@@ -43,6 +43,8 @@
 -- 		more languages
 -- 		exit codes
 -- 		styles
+-- 0.4.1	2011.01.15
+-- 		fixed nextFTHour
 -- 0.4	2011.01.15
 -- 		added --time (thanks Daniel Fischer and Brent Yorgey from beginners@haskell.org!)
 -- 		added --style
@@ -199,6 +201,8 @@
 nextFTHour :: FuzzyTime -> Int
 nextFTHour (FuzzyTime clock hour _ _ night _)
 	| clock == 12 && hour == 11		= if night then 0 else 12
+	| clock == 12 && hour == 12		= 1
+	| clock == 24 && hour == 24		= 1
 	| otherwise						= hour + 1