Fixed: Hour/Minute checks were mixed u