Crop: really fix the bug