Fix command/base/group