Commander bugfix.