PA fix 2

Change-Id: Id52bbd20d6e9a27b16e14368d7c8e231c8fa817f