Improve compatibility with TE3