RemoveCommand trackMap order bug fix