Fixing issue #358