Fixing shib integration