Fix time management