First attmempt to fix TE