Fix for time