Sun time bug fix