Fix BaseCommandValidator