Proposed partial fix for issue #19820

This is a partial fix for issue #19820