diff --git a/MVMCoreUI/Organisms/Carousel.swift b/MVMCoreUI/Organisms/Carousel.swift
index 8ddeca5f..b1cd0f37 100644
--- a/MVMCoreUI/Organisms/Carousel.swift
+++ b/MVMCoreUI/Organisms/Carousel.swift
@@ -183,7 +183,7 @@ open class Carousel: View {
         pagingView?.removeFromSuperview()
         guard let pagingView = view else {
             bottomPin?.isActive = false
-            bottomPin = safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: collectionView.bottomAnchor)
+            bottomPin = bottomAnchor.constraint(equalTo: collectionView.bottomAnchor)
             bottomPin?.isActive = true
             return
         }
@@ -191,9 +191,9 @@ open class Carousel: View {
         addSubview(pagingView)
         pagingView.centerXAnchor.constraint(equalTo: collectionView.centerXAnchor).isActive = true
         collectionView.bottomAnchor.constraint(equalTo: pagingView.bottomAnchor, constant: position).isActive = true
-        safeAreaLayoutGuide.bottomAnchor.constraint(greaterThanOrEqualTo: pagingView.bottomAnchor).isActive = true
+        bottomAnchor.constraint(greaterThanOrEqualTo: pagingView.bottomAnchor).isActive = true
         bottomPin?.isActive = false
-        bottomPin = safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: collectionView.bottomAnchor)
+        bottomPin = bottomAnchor.constraint(equalTo: collectionView.bottomAnchor)
         bottomPin?.priority = .defaultLow
         bottomPin?.isActive = true
         
@@ -336,15 +336,13 @@ extension Carousel: UIScrollViewDelegate {
         handleUserOnBufferCell()
     }
     
-    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+    open func scrollViewDidScroll(_ scrollView: UIScrollView) {
         
         // Check if the user is dragging the card even further past the next card.
         checkForDraggingOutOfBounds(scrollView)
         
         // Let the pager know our progress if needed.
         pagingView?.scrollViewDidScroll?(collectionView)
-        
-        collectionView.collectionViewLayout.invalidateLayout()
     }
     
     public func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {