fix cropper
merge
fix cropper now