DF-3527 removed extra buffer switch