Avoids redefining function.
Merge pull request #467 from LearningLocker/issue/conformance-ryan2

Avoids redefining function.