diff --git a/Examples/simple-fcm-client/ios/Podfile.lock b/Examples/simple-fcm-client/ios/Podfile.lock
index dff921b0bcb9f77b115ccf26a8f1bf6e07be6dd0..32fd9c5bbc5429d570d632415930c3904a0bfd9f 100644
--- a/Examples/simple-fcm-client/ios/Podfile.lock
+++ b/Examples/simple-fcm-client/ios/Podfile.lock
@@ -47,4 +47,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 31f07bb14b00eef65c77cff51721f530ad6eb826
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.4.0
diff --git a/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java b/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java
index cf8c7e057270015c5ef37232712ba3e1a295a657..b15326caaabe56d8a56bb48a0c6768bae66be873 100644
--- a/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java
+++ b/android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java
@@ -232,7 +232,7 @@ public class SendNotificationTask extends AsyncTask<Void, Void, Void> {
                         PendingIntent pendingActionIntent = PendingIntent.getActivity(mContext, notificationID, actionIntent,
                                 PendingIntent.FLAG_UPDATE_CURRENT);
 
-                        notification.addAction(1, actionTitle, pendingActionIntent);
+                        notification.addAction(0, actionTitle, pendingActionIntent);
                     }
                 }
                 
diff --git a/ios/RNFIRMessaging.h b/ios/RNFIRMessaging.h
index 735451a9fb99b0605f55bcba978ae12e81527c53..3bb8d94bfc899d708973d91896dfac98f4348372 100644
--- a/ios/RNFIRMessaging.h
+++ b/ios/RNFIRMessaging.h
@@ -1,7 +1,14 @@
 
 #import <UIKit/UIKit.h>
 
+#if __has_include(<Firebase.h>)
+#import <FirebaseCore/FirebaseCore.h>
+#import <FirebaseMessaging/FirebaseMessaging.h>
+#import <FirebaseInstanceID/FirebaseInstanceID.h>
+#else
 @import Firebase;
+#endif
+
 #import <React/RCTEventEmitter.h>
 
 @import UserNotifications;
diff --git a/package.json b/package.json
index 4184584adb30d225531eed2019b1a1b06a0712cc..138c264964773cbdbc11c1e8d1d7d9c2f8cad631 100644
--- a/package.json
+++ b/package.json
@@ -24,5 +24,5 @@
     "type": "git",
     "url": "git+https://github.com/evollu/react-native-fcm.git"
   },
-  "version": "14.1.0"
+  "version": "14.1.2"
 }