Fix end time not being loaded correctly