CLC-1226 Time marches forward when completing/uncompleting tasks