Fixed circular referens between modules