Fixed CE on some systems