Potential fix to get Modules::run() working better as needed in #979