Fix time-frame problem (kind of)