diff --git a/app/build.gradle b/app/build.gradle
index 736b97f3..782f8921 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 211
-    def appVersionName = '1.16.29'
+    def appVersionCode = 212
+    def appVersionName = '1.16.30'
 
     signingConfigs {
         release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index f40023c9..cf516e7e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -805,7 +805,7 @@ public class SpedizioneViewModel {
 
         MtbColr refMtbColr = null;
 
-        if (scannedMtbColr != null && refMtbColt != null && refMtbColt.getMtbColr().size() > 0) {
+        if (refMtbColt != null && refMtbColt.getMtbColr().size() > 0) {
             Optional<MtbColr> optionalMtbColr = Stream.of(refMtbColt.getMtbColr())
                     .filter(y -> UtilityString.equalsIgnoreCase(y.getCodMart(), scannedMtbColr.getCodMart()) &&
                             UtilityString.equalsIgnoreCase(y.getCodTagl(), scannedMtbColr.getCodTagl()) &&
@@ -816,7 +816,7 @@ public class SpedizioneViewModel {
             if (optionalMtbColr.isPresent()) refMtbColr = optionalMtbColr.get();
         }
 
-        MtbColr mtbColrToUse = refMtbColr != null ? refMtbColr : scannedMtbColr;
+        MtbColr mtbColrToUse = scannedMtbColr != null ? scannedMtbColr : refMtbColr;
 
         if (mtbColrToUse != null) {
             if (pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
@@ -830,10 +830,10 @@ public class SpedizioneViewModel {
 
                 qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
             } else {
-                if (UtilityBigDecimal.equalsOrLowerThan(scannedMtbColr.getNumCnf(), numCnfDaEvadere)) {
-                    numCnfDaPrelevare = scannedMtbColr.getNumCnf();
-                    qtaCnfDaPrelevare = scannedMtbColr.getQtaCnf();
-                    qtaColDaPrelevare = scannedMtbColr.getQtaCol();
+                if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getNumCnf(), numCnfDaEvadere)) {
+                    numCnfDaPrelevare = mtbColrToUse.getNumCnf();
+                    qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
+                    qtaColDaPrelevare = mtbColrToUse.getQtaCol();
                 } else {
                     numCnfDaPrelevare = numCnfDaEvadere;
                     qtaColDaPrelevare = qtaDaEvadere;