add is_null check to timestamp fixing