diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/CheckboxImageAdapter.java b/app/src/main/java/de/apps4ics/mountainnavigation/CheckboxImageAdapter.java
index 72b8bc5..20a83a4 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/CheckboxImageAdapter.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/CheckboxImageAdapter.java
@@ -7,11 +7,9 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.TableRow;
 import android.widget.TextView;
-import android.widget.Toast;
 
 /**
  * Created by Vinz on 09.10.2015.
@@ -104,15 +102,24 @@
             @Override
             public void onClick(View v) {
                 holder.cb.performClick();
-                if(holder.cb.isChecked()){
-                    itemChecked[position] = true;
-                    nrOfItems++;
-                } else {
-                    itemChecked[position] = false;
-                    nrOfItems--;
-                }
+            }
+        });
+        holder.cb.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                updateCheckbox(holder, position);
             }
         });
         return convertView;
     }
+
+    private void updateCheckbox(ViewHolder holder, int position){
+        if(holder.cb.isChecked()){
+            itemChecked[position] = true;
+            nrOfItems++;
+        } else {
+            itemChecked[position] = false;
+            nrOfItems--;
+        }
+    }
 }