Attempted auto shield fix