Added extra-security-check