DATACASS-148: fixed