Fix for issue #1670