bufix and DF patch