fixes #47995895 and #47993455