AI-524 : fixed loading issue