Fix for TFSTAT-75