Fixing module issue