Fix the missing-module-names bug properly.