diff --git a/src/core/question/providers/helper.ts b/src/core/question/providers/helper.ts
index 0cb77a0b0..7623ea747 100644
--- a/src/core/question/providers/helper.ts
+++ b/src/core/question/providers/helper.ts
@@ -275,10 +275,11 @@ export class CoreQuestionHelperProvider {
                     question.initObjects = this.textUtils.parseJSON(initMatch, null);
                 }
 
-                const amdRegExp = new RegExp('require\\(\\[["\']qtype_' + question.type + '/question["\']\\], ?' +
-                    'function\\(amd\\) ?\\{ ?amd\\.init\\((["\'](q|question-' + usageId + '-)' + question.slot +
-                    '["\'].*?)\\);', 'm');
+                const amdRegExp = new RegExp('require\\(\\[["\']qtype_' + question.type + '/question["\']\\],[^f]*' +
+                    'function\\(amd\\)[^\\{]*\\{[^a]*amd\\.init\\((["\'](q|question-' + usageId + '-)' + question.slot +
+                    '["\'].*)\\);', 'm');
                 const amdMatch = match.match(amdRegExp);
+
                 if (amdMatch) {
                     // Try to convert the arguments to an array and add them to the question.
                     question.amdArgs = this.textUtils.parseJSON('[' + amdMatch[1] + ']', null);