Fixed index references to modules.
4 files changed