Finally fixed the buffer dialog. Really really really this time.