Modify a little in PiS 16