[DF-185] fix after merge