Fix for different time formats