Fix in AD

Change-Id: I70a7a7b16c2ca9f9a0b24107d6f08407ecfb8cdb