Fix for issue #1355