upstream fix for mods