Another fix for issue #1347