Fix for issue #17574