Fix after pick