Clock class fix2