Bugfix for module overrides
Merge pull request #371 from monoxide0184/master

Another bug fix for module overrides