Fix for time format