[DF-2316] - refixed after Viktor's code review.