Removed circular reference