Fixed module interdependency