Fix for security