Fix CRA