fixed the boroken circular references