Fix on command class