Fix potential timer problem