Use proper end time