Fix for timer reset