Fix so Chicai can retire