Fix for timer issue - timer was never stopped, just new ones added