aap fixed bug