Fixed problem with sunrise
Merged