fixed pickup fn