Fix time to not overlap