change should_convert_to_time_zone method
improve comment