Fixing #29436 and @ready