Inconsistent use of HOUR_OF_DAY again