diff --git a/src/contents/team.tsx b/src/contents/team.tsx
index 6cff0195aa60a7f1a874ba08967f40fbc0514da5..09c6b331505b9c5f04ba1873564398d1373aa762 100644
--- a/src/contents/team.tsx
+++ b/src/contents/team.tsx
@@ -108,9 +108,6 @@ function createSteckbriefe(data: Array<SteckbriefInterface>){
         if (i + 1 === data[index].igemjob.length ) {
           jobs += " and " + data[index].igemjob[i];
         }
-        else if (i  ===  0 ) {
-          jobs +=  data[index].igemjob[i];
-        }
         else{
           jobs +=  data[index].igemjob[i] + ", ";
         }
@@ -123,12 +120,9 @@ function createSteckbriefe(data: Array<SteckbriefInterface>){
     // Hobbies
     var hobbs = ""; 
     for (let i = 0; i < data[index].hobbies.length; i++) {
-      if (i + 1 === data[index].igemjob.length ) {
+      if (i + 1 === data[index].hobbies.length ) {
         hobbs += " and " + data[index].hobbies[i];
       }
-      else if (i  ===  0 ) {
-        hobbs +=  data[index].hobbies[i];
-      }
       else{
         hobbs +=  data[index].hobbies[i] + ", ";
       }