Insecure hotfix

Fix security holes