diff --git a/tellstickd/README b/tellstickd/README
index 5bc9e9c9..14314f5a 100644
--- a/tellstickd/README
+++ b/tellstickd/README
@@ -35,6 +35,7 @@ Bug reports are welcome, but even more appreciated are patches with the solution
 
 Revision history
 =================
+2008-02-15    0.3.2    Corrected a fatal bug regarding switch logic.
 2008-02-15    0.3.1    Changed update interval back from 50 to 60 seconds.
 2008-02-14    0.3.0    New feature: On- and off times can be randomized within a given interval. Changed update interval from 60 to 50 seconds.
 2008-02-12    0.2.1    Changed behaviour when program is called without argument. Now presents: Try "tellstickd --help" for more information.
diff --git a/tellstickd/tellstickd b/tellstickd/tellstickd
index 99ce4011..0f9746dc 100755
--- a/tellstickd/tellstickd
+++ b/tellstickd/tellstickd
@@ -17,7 +17,7 @@ $LOG_FILE = "/var/log/tellstickd";
 # You should not need to go beyond this point (unless you have found a bug or need to improve the functionality).
 $AUTHOR = "Magnus Juntti, mjuntti\@gmail.com";
 $PROGRAM_NAME = "tellstickd";
-$VERSION = "0.3.1";
+$VERSION = "0.3.2";
 
 
 # Structure of the configurations to be read;
@@ -93,8 +93,8 @@ sub is_inbetween_times
     $time1 =~ s/://g;
     $time2 =~ s/://g;
     $curr_time =~ s/^0*//;
-    $sunrise_time =~ s/^0*//;
-    $sunset_time =~ s/^0*//;
+    $time1 =~ s/^0*//;
+    $time2 =~ s/^0*//;
 
     # If we pass midnight, the following has to be checked
     if ($time2 <= $time1) {
@@ -522,7 +522,7 @@ while (1) {
 
 	# First if we consider daytime off
 	if ($device_cfg[$i][5] == $YES) {
-	    if (is_inbetween_times($device_cfg[$i][3], $device_cfg[$i][4], $current_time) == $YES && is_inbetween_times($device_cfg[$i][20], $device_cfg[$i][21]) == $NO) {
+	    if (is_inbetween_times($device_cfg[$i][3], $device_cfg[$i][4], $current_time) == $YES && is_inbetween_times($device_cfg[$i][20], $device_cfg[$i][21], $current_time) == $NO) {
 		rfcmd_exec($i, 1);
 	    }
 	    else {