Made form protection more careful