Fix for issue #1720