Fix for time creation