fix 4412 security issue part 2