Fix for issue #1092731