[DF-2176] Fixed bugs