fixed crv, and crs bug