diff --git a/jquery.cycle2.carousel.js b/jquery.cycle2.carousel.js
index aa45d57..3fcc9d7 100644
--- a/jquery.cycle2.carousel.js
+++ b/jquery.cycle2.carousel.js
@@ -36,15 +36,17 @@ $.fn.cycle.transitions.carousel = {
         // issue #10
         for (var i=0; i < opts.startingSlide; i++) {
             opts.container.append( opts.slides[0] );
-        }        
+        }
+
+        if (opts.slideCount <= opts.carouselVisible)
+            opts._nextBoundry = 0;
+
     },
 
     // transition API impl
     postInit: function( opts ) {
         var i, j, slide, pagerCutoffIndex, wrap;
         var vert = opts.carouselVertical;
-        if (opts.carouselVisible && opts.carouselVisible > opts.slideCount)
-            opts.carouselVisible = opts.slideCount - 1;
         var visCount = opts.carouselVisible || opts.slides.length;
         var slideCSS = { display: vert ? 'block' : 'inline-block', position: 'static' };