diff --git a/ios/RNMBX/RNMBXCamera.swift b/ios/RNMBX/RNMBXCamera.swift
index 085d0cae8..191bfe54e 100644
--- a/ios/RNMBX/RNMBXCamera.swift
+++ b/ios/RNMBX/RNMBXCamera.swift
@@ -595,14 +595,14 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
     return super.removeFromMap(map, mapView: mapView, reason: reason)
   }
 
-  @objc public func moveBy(x: Double, y: Double, animationMode: NSNumber?, animationDuration: NSNumber?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+  @objc public func moveBy(x: Double, y: Double, animationMode: Double, animationDuration: Double, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     withMapView { mapView in
       let contentFrame = mapView.bounds.inset(by: mapView.safeAreaInsets)
       let centerPoint = CGPoint(x: contentFrame.midX, y: contentFrame.midY)
       let endCameraPoint = CGPoint(x: centerPoint.x + x, y: centerPoint.y + y)
       let cameraOptions = mapView.mapboxMap.dragCameraOptions(from: centerPoint, to: endCameraPoint)
       
-      let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
+      let duration = animationDuration / 1000
 
       if (duration == 0.0) {
         mapView.mapboxMap.setCamera(to: cameraOptions)
@@ -611,7 +611,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
         
       var curve: UIView.AnimationCurve = .linear
-      if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
+      if let m = CameraMode(rawValue: Int(animationMode)) {
           curve = m == CameraMode.ease ? .easeInOut : .linear
       }
 
@@ -622,18 +622,18 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
   @objc public func scaleBy(
     x: Double,
     y: Double,
-    scaleFactor: NSNumber,
-    animationMode: NSNumber?,
-    animationDuration: NSNumber?,
+    scaleFactor: Double,
+    animationMode: Double,
+    animationDuration: Double,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
     withMapView { mapView in
       let currentZoom = mapView.cameraState.zoom
-      let newZoom = currentZoom + log2(scaleFactor.doubleValue)
+      let newZoom = currentZoom + log2(scaleFactor)
       let anchor = CGPoint(x: x, y: y)
       let cameraOptions = CameraOptions(anchor: anchor, zoom: newZoom)
-      let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
+      let duration = animationDuration / 1000
         
       if (duration == 0.0) {
         mapView.mapboxMap.setCamera(to: cameraOptions)
@@ -642,7 +642,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
         
       var curve: UIView.AnimationCurve = .linear
-      if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
+      if let m = CameraMode(rawValue: Int(animationMode)) {
           curve = m == CameraMode.ease ? .easeInOut : .linear
       }
 
diff --git a/ios/RNMBX/RNMBXCameraModule.mm b/ios/RNMBX/RNMBXCameraModule.mm
index e68b7e80b..6599a79f9 100644
--- a/ios/RNMBX/RNMBXCameraModule.mm
+++ b/ios/RNMBX/RNMBXCameraModule.mm
@@ -53,8 +53,8 @@ - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))blo
 RCT_EXPORT_METHOD(moveBy:(nonnull NSNumber *)viewRef
                   x:(double)x
                   y:(double)y
-                  animationMode:(nonnull NSNumber *)animationMode
-                  animationDuration:(nonnull NSNumber *)animationDuration
+                  animationMode:(double)animationMode
+                  animationDuration:(double)animationDuration
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
         [self withCamera:viewRef block:^(RNMBXCamera *camera) {
@@ -65,9 +65,9 @@ - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))blo
  RCT_EXPORT_METHOD(scaleBy:(nonnull NSNumber *)viewRef
                    x:(double)x
                    y:(double)y
-                   animationMode:(nonnull NSNumber *)animationMode
-                   animationDuration:(nonnull NSNumber *)animationDuration
-                   scaleFactor:(nonnull NSNumber *)scaleFactor
+                   animationMode:(double)animationMode
+                   animationDuration:(double)animationDuration
+                   scaleFactor:(double)scaleFactor
                    resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject) {
          [self withCamera:viewRef block:^(RNMBXCamera *camera) {