DF-1675 initialization fixed