Commander sidearm fix