Timer issue fixed