Fixed not killing timer on time extend