patch from issue 12374091