add another patch from upstream