Another try to fix security weirdness