fix for pickup option