Fix Command Class