+end_time fix