Fix major security issue