Fix for bug TINF-633