DAT-2255 Addressing code review remark