diff --git a/config/module.lua b/config/module.lua
index 9b50224e..a2a8e906 100644
--- a/config/module.lua
+++ b/config/module.lua
@@ -1,6 +1,6 @@
 return {
     -- type of machine to handle together
-    default_module_row_count = 4,
+    default_module_row_count = 6,
     module_slot_max = 4,
     machine_prod_disallow = {
         ['beacon'] = true
diff --git a/modules/gui/module.lua b/modules/gui/module.lua
index 74470348..7cd5d94a 100644
--- a/modules/gui/module.lua
+++ b/modules/gui/module.lua
@@ -67,21 +67,36 @@ local function clear_module(player, area, machine)
     end
 end
 
-local function apply_module(player, area, machine, module)
+local function apply_module(player, area, machine, modules)
     for _, entity in pairs(player.surface.find_entities_filtered{area=area, name=machine, force=player.force}) do
         if config.machine_craft[machine] then
             local m_current_recipe = entity.get_recipe()
 
             if m_current_recipe ~= nil then
                 if config.module_allowed[m_current_recipe.name] then
-                    entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=module}                    end
+                    entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
+                    entity.last_user = player
+
+                else
+                    for k in pairs(modules) do
+                        if k:find('productivity') then
+                            modules[k:gsub('productivity', 'effectivity')] = modules[k]
+                            modules[k] = nil
+                        end
+                    end
+
+                    entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
+                    entity.last_user = player
+                end
 
             else
-                entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=module}
+                entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
+                entity.last_user = player
             end
 
         else
-            entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=module}
+            entity.surface.create_entity{name='item-request-proxy', target=entity, position=entity.position, force=entity.force, modules=modules}
+            entity.last_user = player
         end
     end
 end