Fix stack overflow error on multi-site
Merge pull request #11 from tlovett1/bugfix/fix-ms-stack-overflow

Fix stack overflow error on multi-site