Fixed sunset bug