diff --git a/source/BuildmLearnStore/src/com/buildmlearnstore/activities/FlashActivity.java b/source/BuildmLearnStore/src/com/buildmlearnstore/activities/FlashActivity.java
index 641dd46..4794b06 100644
--- a/source/BuildmLearnStore/src/com/buildmlearnstore/activities/FlashActivity.java
+++ b/source/BuildmLearnStore/src/com/buildmlearnstore/activities/FlashActivity.java
@@ -106,7 +106,7 @@ public void onClick(View v) {
 			@Override
 			public void onClick(View v) {
 
-				if (iQuestionIndex < mCardList.size()) {
+				if (iQuestionIndex < mCardList.size()-1) {
 					isFlipped = false;
 					iQuestionIndex++;
 					questionView.setVisibility(View.VISIBLE);
@@ -115,6 +115,7 @@ public void onClick(View v) {
 					populateQuestion(iQuestionIndex);
 
 				} else {
+					finish();
 					/*Intent myIntent = new Intent(FlashActivity.this,
 							ScoreActivity.class);
 					startActivity(myIntent);