improvements to avoid slow request when a user goes over the buffer limit, looks like this fix works around that problem