DATACASS-142: fixed reported issue
DATACASS-142: fixed reported issue