More fixing broken pick_up for equipment under certain conditions