Fixed references to the modules creation