diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 17626b5..30aa2a4 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1965,12 +1965,6 @@ (defun org-export-latex-tables (insert)
                             (concat "\\begin{longtable}{" align "}\n")
                           (if floatp
 			      (format "\\begin{%s}%s\n" tblenv placement)))
-                        (if floatp
-                            (format
-                             "\\caption%s{%s} %s"
-                             (if shortn (concat "[" shortn "]") "")
-                             (or caption "")
-			     (if label (format "\\label{%s}" label) "")))
                         (if (and longtblp caption) "\\\\\n" "\n")
                         (if (and org-export-latex-tables-centered (not longtblp))
                             "\\begin{center}\n")
@@ -1993,6 +1987,12 @@ (defun org-export-latex-tables (insert)
                         (if (not longtblp) (format "\n\\end{%s}" tabular-env))
                         (if longtblp "\n" (if org-export-latex-tables-centered
                                               "\n\\end{center}\n" "\n"))
+                        (if floatp
+                            (format
+                             "\\caption%s{%s} %s"
+                             (if shortn (concat "[" shortn "]") "")
+                             (or caption "")
+			     (if label (format "\\label{%s}" label) "")))
                         (if longtblp
                             "\\end{longtable}"
                           (if floatp (format "\\end{%s}" tblenv)))))
@@ -2042,11 +2042,11 @@ (defun org-export-latex-convert-table.el-table ()
       (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}")))
     (when floatp
       (setq tbl (concat "\\begin{table}\n"
+			tbl
 			(format "\\caption%s{%s%s}\n"
 				(if shortn (format "[%s]" shortn) "")
 				(if label (format "\\label{%s}" label) "")
 				(or caption ""))
-			tbl
 			"\n\\end{table}\n")))
     (insert (org-export-latex-protect-string tbl))))