Partial fix for non-upper-tri T?