fix for issue #1352