Bug fix Carousel