Fix for issue #1699.