Fix for end time (non+1d)