Fix multiple modules