AI-512 : buildfix