Repair ugliness I created with my base command changes