fixed security issue
merge conflict