diff --git a/CHANGELOG.md b/CHANGELOG.md
index 836cd49..c7e8a9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## master (unreleased)
+* Improve support for multiple forms in the same line by replacing beginning-of-defun fn.
 * [#202](https://github.com/clojure-emacs/inf-clojure/issues/202): Add ClojureCLR support.
 * [#204](https://github.com/clojure-emacs/inf-clojure/issues/204): Scroll repl buffer on insert commands
 * [#208](https://github.com/clojure-emacs/inf-clojure/pull/208) Display message after setting repl.
diff --git a/inf-clojure.el b/inf-clojure.el
index 4c5e018..9efe1de 100644
--- a/inf-clojure.el
+++ b/inf-clojure.el
@@ -1018,7 +1018,7 @@ current defun else return the string.."
     (let ((end (point))
           (case-fold-search t)
           (func (if bounds #'cons #'buffer-substring-no-properties)))
-      (beginning-of-defun)
+      (beginning-of-defun-raw)
       (funcall func (point) end))))
 
 (defun inf-clojure-eval-defun (&optional and-go)