fix a part of potential circular reference