Fixing hour issues...