[DF-4136] Fix bug