proposed fix for [14312242]