Fixed bug that made pick_up break under specific conditions