Fix for time zone being off