Modules build fix