Fixed #PL-101 + extended fix to other related classes