RemoveCommand unwind() bug fix