Better fix for issue #1356