Fix for issue #1668