Fixed pickup logic