Stop recursion loop, and fix permission.
Merge pull request #2 from adam-vessey/7.x-permission-and-recursion

Stop recursion loop, and fix permission.