Fix for issue #1656

Fix for issue #1656