Fix for issue #1775.