Another important fix in PL module.