Fixes issue #280.