Fix IdDropped and IdPicked