Fix for TIVI-1940