Fixed bug in pick up method