CFRCPRAP-196: fixed