Fixes Modules, issue #44

Fixes #44