DF-1236 fix.