[DF-1785] Bug fix