Fixing for issue #1158