Cr Fix + bug fix