Fix instantiate modules