DF-1946. Fix returning value