Fixing issue #378.