Fix crop picking