Fixed an infinite recursion bug
Merge pull request #980 from wibblymat/infinite-dependency-recursion

Fixed an infinite recursion bug