Adjust to new clock structure
v9.0.6