more CR fix