Fix stacked safarinets