Classic Clock fix