AI-685 - naive fix