Final carousel fix