Fixed pickup to be more reliable