Fixing issue #348.