Better shib handling hopefully