Fix. tr1 support