[DF-1062]. Proper fix.