issue #5627, with mods