Fixed CE on MACH
Merge github.com:vysheng/tg