Fix TR1/Array yet again?