Fixing issue #287.