Fix for TFSTAT-70