CPA bug and limitation change