Fixing issue #377.