still fixing NPE in PL...