Fixing bug in pickup