Temporary remove of CV_WRAP