Fix circular dependency property exception
Merge pull request #71 from dennishendriksen/master

Fix circular dependency property exception