Fixing issue #280.