some fix in PL