Apply fix  from #2094

Leaving everything else as is.