Fix for issue #1703.