Fix to get this working with the modules in 3.0