Fix circular dependency property exception