correct time handling