COMMNOS-219 correct bug