Mr. T bug fixing