Fix bug TIVI-431