Fixed the base class Command