- fix another circular import error