Fix #10730 (fill ring does not work as expected)