Fixed TimeDate bug