[DF-1504] - additional cases found were fixed.