cwc: fix EMM forward