Fixing issue #375