Tweak for #362 if MDL-36499 solution applied.
V2.7.9d