Fixed module ordering