diff --git a/vds-app/.expo-shared/assets.json b/vds-app/.expo-shared/assets.json
deleted file mode 100644
index 0967ef4..0000000
--- a/vds-app/.expo-shared/assets.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/vds-app/App/components/ExamQuestions.js b/vds-app/App/components/ExamQuestions.js
index dc3fb91..d7d04a9 100644
--- a/vds-app/App/components/ExamQuestions.js
+++ b/vds-app/App/components/ExamQuestions.js
@@ -29,10 +29,9 @@ const generateQuestions = () => {
   examScheme.forEach( (elem) => {
     let currentSection = allQuestions[elem.section]
     for(let i=0; i<elem.questions; i++) {
-      const currentIndex = Math.floor(Math.random() * elem.questions)
-      //currentSection[currentIndex].question = elem.section + currentSection[currentIndex].question
-      tmpQuestions.push(currentSection[currentIndex])
+      const currentIndex = Math.floor(Math.random() * currentSection.length)
       currentSection = currentSection.filter( (item, index) => index != currentIndex)
+      tmpQuestions.push(currentSection[currentIndex])
     }
   })
 }