(#9) Fixing issues with module.