fixes #28923