[pl] segmentation bug fix
[pl] more disambiguation to catch more mistakes