Temporary PCC ISSUES and workarounds (2)