Fix module interaction