Fixing high buffer usage