circular reference bugfix