Topiarist circular dependency bug fix