Added fix for hours at midnight