patch from issue 437903002