Fixing an issue after PL modifications