fix #5895 : security issues