fix timer (to be continued...)