diff --git a/templates/bibitem.html b/templates/bibitem.html
index 63f8176..4a3d9ee 100644
--- a/templates/bibitem.html
+++ b/templates/bibitem.html
@@ -23,7 +23,15 @@
       In $booktitle$.<br>
     $endif$
     $if(journal)$
-      $journal$, $volume$($number$).<br>
+      $if(volume)$
+        $if(number)$
+          $journal$, $volume$($number$). <br>
+        $else$
+          $journal$, $volume$. <br>
+        $endif$
+      $else$
+        $journal$. <br>
+      $endif$
     $endif$
     $if(school)$
       $school$.<br>