Fixed module calling