Issue #12: Hotfix for modules loading