Fixed goofy bug about timer switching to current one which has been changed