diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index 9e85757..6428c8c 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -90,7 +90,7 @@ end")
 		  (if (org-babel-octave-graphical-output-file params)
 		      (mapconcat 'identity
 				 (list
-				  "set (0, \"defaultfigurevisible\", \"off\");"
+				  "set (0, 'defaultfigurevisible', 'off');"
 				  full-body
 				  (format "print -dpng %s" (org-babel-octave-graphical-output-file params)))
 				 "\n")
@@ -231,8 +231,8 @@ value of the last statement in BODY, as elisp."
 		(org-babel-comint-with-output
 		    (session
 		     (if matlabp
-			 org-babel-octave-eoe-indicator
-		       org-babel-octave-eoe-output)
+			 org-babel-octave-eoe-output
+		       org-babel-octave-eoe-indicator)
 		     t full-body)
 		  (insert full-body) (comint-send-input nil t)))) results)
     (case result-type