Fix bug defun changed to defmacro