patch from #839132 added