[DF-1998] Additional fix.