Fixed bug reported in #35175