Fix for TAT