Fix TE support :)