Since the last fix had some nasty side effects (too many buffers were