Fixing Clocks Leftovers #1

Fixing Clocks