diff --git a/CHANGELOG b/CHANGELOG
index 736b610..ebe5126 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 # Version 2.4
 - Adding Login window support
 - Adding Russian translation (Thanks to blogdron)
+- Bugfix: Time period calculation on locations near the dateline, like Japan
 
 # Version 2.3
 - Adding Dutch translation
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py
index 78c199e..4c4d2cb 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py
@@ -2,7 +2,7 @@
 from gi.repository import Gio, Gdk
 
 # Packages
-import os, time, locale, subprocess, sys
+import os, time, locale, subprocess
 from PIL import Image
 
 # Local scripts
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/suntimes.py b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/suntimes.py
index 65e6200..311911c 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/suntimes.py
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/suntimes.py
@@ -1,5 +1,5 @@
 from math import pi, sin, asin, acos, cos, floor, atan, tan
-from datetime import datetime, timezone, time
+from datetime import datetime, timezone, time, timedelta
 
 
 class Suntimes:
@@ -55,7 +55,7 @@ class Suntimes:
     civial_dusk_start = self.calc_sunrise_sunset_time(False)
     night_start = self.calc_sunrise_sunset_time(False, 96)
 
-    light_period_duration = (sunset_start - morning_start) / 8
+    light_period_duration = timedelta(seconds=(sunset_start - morning_start).seconds / 8)
 
     noon_start = morning_start + 3 * light_period_duration
     afternoon_start = morning_start + 5 * light_period_duration