[PATCH] Fix timer race