fixed issue with circular module dependencies