diff --git a/kosmorrolib/ephemerides.py b/kosmorrolib/ephemerides.py
index eb0b1d5..6e41e6a 100644
--- a/kosmorrolib/ephemerides.py
+++ b/kosmorrolib/ephemerides.py
@@ -74,7 +74,7 @@ class EphemeridesComputer:
 
         if len(rise_times) == 2:
             rise_time = rise_times[0 if arr[0] else 1]
-            set_time = rise_times[0 if not arr[1] else 0]
+            set_time = rise_times[1 if not arr[1] else 0]
         else:
             rise_time = rise_times[0] if arr[0] else None
             set_time = rise_times[0] if not arr[0] else None
diff --git a/test/__init__.py b/test/__init__.py
index 3b6d8eb..c5e0976 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1 +1,2 @@
-from .dumper import *
\ No newline at end of file
+from .dumper import *
+from .ephemerides import *
diff --git a/test/ephemerides.py b/test/ephemerides.py
new file mode 100644
index 0000000..15eec01
--- /dev/null
+++ b/test/ephemerides.py
@@ -0,0 +1,22 @@
+import unittest
+from kosmorrolib.ephemerides import EphemeridesComputer
+from kosmorrolib.core import get_skf_objects
+from kosmorrolib.data import Star, Position
+from datetime import date
+
+
+class EphemeridesComputerTestCase(unittest.TestCase):
+    def test_get_ephemerides_for_aster_returns_correct_hours(self):
+        position = Position(0, 0)
+        position.observation_planet = get_skf_objects()['earth']
+        star = EphemeridesComputer.get_asters_ephemerides_for_aster(Star('Sun', skyfield_name='sun'),
+                                                                    date=date(2019, 11, 18),
+                                                                    position=position)
+
+        self.assertEqual('2019-11-18T05:41:31Z', star.ephemerides.rise_time.utc_iso())
+        self.assertEqual('2019-11-18T11:45:02Z', star.ephemerides.culmination_time.utc_iso())
+        self.assertEqual('2019-11-18T17:48:39Z', star.ephemerides.set_time.utc_iso())
+
+
+if __name__ == '__main__':
+    unittest.main()