Beta 9: security patch

Security + New If statement