Fix the module API yet again