v3.0.x: refactor ready handle