Fixed changes for TE 1.0