#14 security enhancement