Fixes stage 2.
Merge pull request #465 from LearningLocker/issue/conformance-ryan2

Fixes stage 2.