diff --git a/js/jcarousel.js b/js/jcarousel.js
index ac1a5b8..9381e90 100644
--- a/js/jcarousel.js
+++ b/js/jcarousel.js
@@ -147,9 +147,8 @@ Drupal.jcarousel.setupCarousel = function(carousel) {
   carousel.pageNumber = 1;
 
   // Disable the previous/next arrows if there is only one page.
-  if (carousel.pageCount == 1) {
-    carousel.buttonNext.addClass('jcarousel-next-disabled').attr('disabled', true);
-    carousel.buttonPrev.addClass('jcarousel-prev-disabled').attr('disabled', true);
+  if (carousel.options.wrap != 'circular' && carousel.pageCount == 1) {
+    carousel.buttons(false, false);
   }
 
   // Always remove the hard-coded display: block from the navigation.