Fix for TFSTAT-71