AAC - Keru contribution - fix