Fixing issue #351