fix the timer and hash issue