fiinally regex cr2 fix?