add patch from #849