fixed issue with currentClock