fixed for TEC 3.0