r21: Fixed real and stub class differences. refs #1 --skip-ci