diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index c079b212..92430680 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -879,12 +879,12 @@
 		0A30D3DC2432741A00124AF0 /* CarouselIndicator */ = {
 			isa = PBXGroup;
 			children = (
-				0A30D3DD2432741A00124AF0 /* BarsCarouselIndicatorModel.swift */,
-				0A30D3DE2432741A00124AF0 /* NumericCarouselIndicatorModel.swift */,
-				0A30D3DF2432741A00124AF0 /* NumericIndicatorView.swift */,
-				0A30D3E02432741A00124AF0 /* BarsIndicatorView.swift */,
 				0A30D3E12432741A00124AF0 /* CarouselIndicatorModel.swift */,
 				0A30D3E22432741A00124AF0 /* CarouselIndicator.swift */,
+				0A30D3DE2432741A00124AF0 /* NumericCarouselIndicatorModel.swift */,
+				0A30D3DF2432741A00124AF0 /* NumericIndicatorView.swift */,
+				0A30D3DD2432741A00124AF0 /* BarsCarouselIndicatorModel.swift */,
+				0A30D3E02432741A00124AF0 /* BarsIndicatorView.swift */,
 			);
 			name = CarouselIndicator;
 			path = ../../../../../../../mvmrc_ios/mvm_core_ui/MVMCoreUI/Atoms/Views/CarouselIndicator;
diff --git a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
index bfa6db01..766db94d 100644
--- a/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/Atomic/MoleculeObjectMapping.swift
@@ -123,6 +123,8 @@ import Foundation
         
         // Other Organisms
         MoleculeObjectMapping.shared()?.register(viewClass: Carousel.self, viewModelClass: CarouselModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: BarsIndicatorView.self, viewModelClass: BarsCarouselIndicatorModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: NumericIndicatorView.self, viewModelClass: NumericCarouselIndicatorModel.self)
         
         // Designed List Items
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconWithRightCaret.self, viewModelClass: ListLeftVariableIconWithRightCaretModel.self)
diff --git a/MVMCoreUI/Atomic/Organisms/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel.swift
index b79cbc03..a45eaf72 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel.swift
@@ -179,7 +179,7 @@ open class Carousel: View {
         var pagingView: (UIView & CarouselPageControlProtocol)? = nil
         
         if let molecule = molecule {
-            pagingView = MoleculeObjectMapping.shared()?.createMolecule(molecule, delegateObject: delegateObject) as? (UIView & MVMCoreUIPagingProtocol) as! (UIView & CarouselPageControlProtocol)
+            pagingView = MoleculeObjectMapping.shared()?.createMolecule(molecule, delegateObject: delegateObject) as? (UIView & CarouselPageControlProtocol)
         }
         
         addPaging(view: pagingView, position: (CGFloat(molecule?.position ?? 20)))