Security vulnerability fix