Fix for issue #17574

Fix #17574