[DF-1214] VS fix.