diff --git a/application/controllers/SurveyAdministrationController.php b/application/controllers/SurveyAdministrationController.php
index 0959d38f275..974c50ba43e 100644
--- a/application/controllers/SurveyAdministrationController.php
+++ b/application/controllers/SurveyAdministrationController.php
@@ -325,12 +325,12 @@ public function actionRegenerateQuestionCodes()
         $iGroupNumber = 0;
         $iGroupSequence = 0;
         $oQuestions = Question::model()
-            ->with(['group', 'questionl10ns'])
+            ->with(['group' => ['alias' => 'g'], 'questionl10ns'])
             ->findAll(
                 array(
                     'select' => 't.qid,t.gid',
                     'condition' => "t.sid=:sid and questionl10ns.language=:language and parent_qid=0",
-                    'order' => 'group.group_order, question_order',
+                    'order' => 'g.group_order, question_order',
                     'params' => array(':sid' => $iSurveyID, ':language' => $oSurvey->language)
                 )
             );