Fixes part of #18535