beefed up org-babel-comint-wait-for-output but it still sometimes misses multiple outputs

lisp/org-babel-comint.el

@@ -88,7 +88,10 @@ then return the a list of the output(s) generated by CMD."
   (org-babel-comint-in-buffer buffer
     (while (progn
              (goto-char comint-last-input-end)
-             (not (re-search-forward comint-prompt-regexp nil t)))
+             (not (and (re-search-forward comint-prompt-regexp nil t)
+                       (goto-char (match-beginning 0))
+                       (string= (face-name (face-at-point))
+                                "comint-highlight-prompt"))))
       (accept-process-output (get-buffer-process buffer)))))
 
 (defun org-babel-comint-command-to-last (buffer cmd)