another patch from upstream