COUL-14 fix for D=>G/G=>D.