Further bug fix to do with the clock reaching 0