RemoveCommand trackMap order bug fix 2