timer issue fixed