Fixing more tr