clock fix for new code