Bug fix of Carousel