Temporary Bugfix for Timer Auto-Removal Bug