UI-3401 improvement