bug fix (timer not reset correctly