fix #64 , clock as well