diff --git a/AmazonSQS/AmazonSQSExample/pom.xml b/AmazonSQS/AmazonSQSExample/pom.xml
index a6297faf..e211c06a 100644
--- a/AmazonSQS/AmazonSQSExample/pom.xml
+++ b/AmazonSQS/AmazonSQSExample/pom.xml
@@ -48,7 +48,7 @@ holder.
     </parent>
     <groupId>fish.payara.cloud.connectors.amazonsqs</groupId>
     <artifactId>amazon-sqs-example</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>ejb</packaging>
 
     <name>Amazon SQS Example</name>
diff --git a/AmazonSQS/AmazonSQSExample/src/main/java/fish/payara/cloud/connectors/amazonsqs/example/NewTimerSessionBean.java b/AmazonSQS/AmazonSQSExample/src/main/java/fish/payara/cloud/connectors/amazonsqs/example/NewTimerSessionBean.java
index ef90dca2..7b00e03b 100644
--- a/AmazonSQS/AmazonSQSExample/src/main/java/fish/payara/cloud/connectors/amazonsqs/example/NewTimerSessionBean.java
+++ b/AmazonSQS/AmazonSQSExample/src/main/java/fish/payara/cloud/connectors/amazonsqs/example/NewTimerSessionBean.java
@@ -55,7 +55,7 @@
 @ConnectionFactoryDefinition(name = "java:comp/env/SQSConnectionFactory",
         description = "SQS Conn Factory",
         interfaceName = "fish.payara.cloud.connectors.amazonsqs.api.AmazonSQSConnectionFactory",
-        resourceAdapter = "amazon-sqs-rar-2.0.0",
+        resourceAdapter = "amazon-sqs-rar-2.1.0",
         minPoolSize = 2, maxPoolSize = 2,
         transactionSupport = TransactionSupportLevel.NoTransaction,
         properties = {"region=${ENV=region}"})
diff --git a/AmazonSQS/AmazonSQSJCAAPI/pom.xml b/AmazonSQS/AmazonSQSJCAAPI/pom.xml
index aac07d33..245e6c4e 100644
--- a/AmazonSQS/AmazonSQSJCAAPI/pom.xml
+++ b/AmazonSQS/AmazonSQSJCAAPI/pom.xml
@@ -48,7 +48,7 @@ holder.
     </parent>
     <groupId>fish.payara.cloud.connectors.amazonsqs</groupId>
     <artifactId>amazon-sqs-jca-api</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
     <name>Amazon SQS JCA Adapter API</name>
     <description>API classes for the Amazon SQS JCA Adapter</description>
diff --git a/AmazonSQS/AmazonSQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java b/AmazonSQS/AmazonSQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java
index 7ec6f23e..b447b17e 100644
--- a/AmazonSQS/AmazonSQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java
+++ b/AmazonSQS/AmazonSQSJCAAPI/src/main/java/fish/payara/cloud/connectors/amazonsqs/api/inbound/SQSPoller.java
@@ -110,8 +110,10 @@ public void run() {
                 Class<?> mdbClass = factory.getEndpointClass();
                 for (Message message : messages) {
                     for (Method m : mdbClass.getMethods()) {
-                        if (isOnSQSMessageMethod(m) && shouldFetchS3Message(message)) {
-                            message = fetchS3MessageContent(message);
+                        if (isOnSQSMessageMethod(m)) {
+                            if (shouldFetchS3Message(message)) {
+                                message = fetchS3MessageContent(message);
+                            }
                             scheduleSQSWork(m, message);
                         }
                     }
diff --git a/AmazonSQS/AmazonSQSRAR/pom.xml b/AmazonSQS/AmazonSQSRAR/pom.xml
index ac5f8368..5f7064db 100644
--- a/AmazonSQS/AmazonSQSRAR/pom.xml
+++ b/AmazonSQS/AmazonSQSRAR/pom.xml
@@ -48,7 +48,7 @@ holder.
     </parent>
     <groupId>fish.payara.cloud.connectors.amazonsqs</groupId>
     <artifactId>amazon-sqs-rar</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>rar</packaging>
     <name>Amazon SQS JCA Adapter RAR</name>
     <description>RAR for the Amazon SQS JCA Adapter</description>