remove circular reference hack