Fixing issue #283.