fix for issue #1695