fixing for changes on TII side of things