Fix for Security Testing