Handle shared commanders correctly