fix Timecop issues