cas-689: after Misagh's code review