GeneralCommand Fix