Fix TINF-633