diff --git a/theme/bxslider_views_slideshow.theme.inc b/theme/bxslider_views_slideshow.theme.inc
index 396b69e..d227cec 100755
--- a/theme/bxslider_views_slideshow.theme.inc
+++ b/theme/bxslider_views_slideshow.theme.inc
@@ -109,16 +109,19 @@ BXSLIDERJS;
   }
   if (!empty($callback['onSlidePrev'])) {
     $bx_slider_js .=
-      "onSlidePrev: function(slideElement, oldIndex, newIndex){" . filter_xss($callback['onSlidePrev']) . "}";
+      "onSlidePrev: function(slideElement, oldIndex, newIndex){" . filter_xss($callback['onSlidePrev']) . "},";
   }
+
+  $bx_slider_js = rtrim($bx_slider_js, ",");
+
   $bx_slider_js .= <<<ENDBXSLIDERJS
      });
     }
 ENDBXSLIDERJS;
 
   //Admin section
-  $bx_slider_js_content = _bxslider_views_slideshow_theme_get_admin_js(
-    $autofieldset, $general, $carousel, $pagerfieldset, $controlsfieldset, $carousel);
+  $bx_slider_js_content = rtrim(_bxslider_views_slideshow_theme_get_admin_js(
+    $autofieldset, $general, $carousel, $pagerfieldset, $controlsfieldset, $carousel), ',');
   drupal_add_js(array('viewsSlideshowBxslider' =>
   array($id => json_encode($bx_slider_js_content))), 'setting');
   // Add my own Javascript implementation via Php.
@@ -180,7 +183,7 @@ BXSLIDERJSCONTENT;
     moveSlides: {$carousel['moveSlides']},
     slideWidth: {$carousel['slideWidth']},
     useCSS: {$general['useCSS']},
-    autoDirection: '{$autofieldset['autoDirection']}'
+    autoDirection: '{$autofieldset['autoDirection']}',
 BXSLIDERJSCONTENT;
   return filter_xss(trim($bx_slider_js));
 }