Fix to new HardwareClock logic.