Revert BLOCK_BUFFER_SIZE back to 16, as this was not causing the problem