diff --git a/backend/package.json b/backend/package.json
index 9c9cd1760..8cfa6e791 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -5,7 +5,7 @@
 	"license": "Apache 2.0",
 	"description": "Provide rich user experience for Yeoman generators using VSCode extension or the browser",
 	"repository": "https://github.com/SAP/yeoman-ui",
-	"version": "0.0.17",
+	"version": "0.0.18",
 	"engines": {
 		"vscode": "^1.38.0"
 	},
diff --git a/frontend/src/components/Step.vue b/frontend/src/components/Step.vue
index 78812b481..8a7dddba4 100644
--- a/frontend/src/components/Step.vue
+++ b/frontend/src/components/Step.vue
@@ -32,7 +32,7 @@ export default {
       deep: true,
       handler() {
         const invalidQuestions = _.filter(this.currentPrompt.questions, question => {
-            return question.isValid === false
+            return (question.isValid === false && question.isWhen === true)
         })
         this.$emit("stepvalidated", _.isEmpty(invalidQuestions))
       }
diff --git a/generator-foodq/generators/app/index.js b/generator-foodq/generators/app/index.js
index 5776d84a5..f8600337c 100644
--- a/generator-foodq/generators/app/index.js
+++ b/generator-foodq/generators/app/index.js
@@ -61,7 +61,7 @@ module.exports = class extends Generator {
         default: "Junk food"
       },
       {
-        when: (response) => {
+        when: async (response) => {
           this.log(response.hungry);
           const promise = new Promise((resolve, reject) => {
             this.log(`Purposely delaying response for 2 seconds...`);