Prevent a recursion loop early.
Merge pull request #283 from adam-vessey/7.x

Prevent a recursion loop early.