Fixed module ordering bug