fix one/other for cmn and ja