DAT-2265 fixed after CR