diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
index a8a6c2a..a820f26 100644
--- a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
@@ -139,9 +139,9 @@ public class CampaignProductDetailsActivity extends BaseActivity {
                     */
 
                     /*
-                    if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
-                            menuProductOptionModel.getType().toLowerCase().equals("select") &&
-                                    !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                    boolean isRadio = menuProductOptionModel.getType().toLowerCase().equals("radio") || menuProductOptionModel.getType().toLowerCase().equals("select");
+                    boolean isAnyOptionValueSelected = isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList());
+                    if(isRadio && !isAnyOptionValueSelected){
                         menuProductOptionValueModel.setSelected(true);
                     }
                     */
@@ -269,9 +269,9 @@ public class CampaignProductDetailsActivity extends BaseActivity {
                 */
 
                 /*
-                if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
-                        menuProductOptionModel.getType().toLowerCase().equals("select") &&
-                                !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                boolean isRadio = menuProductOptionModel.getType().toLowerCase().equals("radio") || menuProductOptionModel.getType().toLowerCase().equals("select");
+                boolean isAnyOptionValueSelected = isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList());
+                if(isRadio && !isAnyOptionValueSelected){
                     menuProductOptionValueModel.setSelected(true);
                 }
                 */
diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
index 3cfe820..d9a7208 100644
--- a/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
+++ b/app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
@@ -142,9 +142,9 @@ public class ProductDetailsActivity extends BaseActivity {
                         menuProductOptionValueModel.setSelected(true);
                     }
                     */
-                    if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
-                            menuProductOptionModel.getType().toLowerCase().equals("select") &&
-                                    !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                    boolean isRadio = menuProductOptionModel.getType().toLowerCase().equals("radio") || menuProductOptionModel.getType().toLowerCase().equals("select");
+                    boolean isAnyOptionValueSelected = isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList());
+                    if(isRadio && !isAnyOptionValueSelected){
                         menuProductOptionValueModel.setSelected(true);
                     }
 
@@ -270,9 +270,9 @@ public class ProductDetailsActivity extends BaseActivity {
                 }
                 */
 
-                if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
-                        menuProductOptionModel.getType().toLowerCase().equals("select") &&
-                                !isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
+                boolean isRadio = menuProductOptionModel.getType().toLowerCase().equals("radio") || menuProductOptionModel.getType().toLowerCase().equals("select");
+                boolean isAnyOptionValueSelected = isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList());
+                if(isRadio && !isAnyOptionValueSelected){
                     menuProductOptionValueModel.setSelected(true);
                 }
             }