fix for issue #1355