diff --git a/solarconditions.py b/solarconditions.py
index f6bab58..4da83a9 100644
--- a/solarconditions.py
+++ b/solarconditions.py
@@ -114,8 +114,8 @@ def get_moon(lat=0, lon=0):
     moon_table['altitude'] = moon.alt
     moon_table['rise_time'] = ephem.localtime(obs.next_rising(moon)).strftime('%a %d %I:%M')
     moon_table['set_time'] = ephem.localtime(obs.next_rising(moon)).strftime('%a %d %I:%M')
-    moon_table['next_full_moon'] = ephem.localtime(obs.next_rising(moon)).strftime('%a %d %I:%M')
-    moon_table['next_new_moon'] = ephem.localtime(obs.next_rising(moon)).strftime('%a %d %I:%M')
+    moon_table['next_full_moon'] = ephem.localtime(obs.next_full_moon()).strftime('%a %d %I:%M')
+    moon_table['next_new_moon'] = ephem.localtime(obs.next_new_moon()).strftime('%a %d %I:%M')
 
     moon_data = f"Moon Rise:" + moon_table['rise_time'] + " Set:" + moon_table['set_time'] + "\nMoon Phase:" \
         + moon_table['phase'] + " @:" + str('{0:.2f}'.format(moon_table['illumination'])) + "%" \