Time option crash fixed