Fix Command Set