diff --git a/application/models/Survey.php b/application/models/Survey.php
index c0f64916240..943790ed1d6 100755
--- a/application/models/Survey.php
+++ b/application/models/Survey.php
@@ -543,7 +543,9 @@ public function rules()
 
     /**
      * afterFindSurvey to fix and/or add some survey attribute
+     * - event afterFindSurvey (for all attributes)
      * - Fix template name to be sure template exist
+     * - setOptions for inherited value
      */
     public function afterFindSurvey()
     {
@@ -556,13 +558,11 @@ public function afterFindSurvey()
                 $this->setAttribute($attribute,$event->get($attribute));
             }
         }
-
-        // set inherited values for existing survey
-        $this->setOptions($this->gsid);
-        
         if ($this->template != 'inherit'){
             $this->template = Template::templateNameFilter($this->template);
         }
+        /* this is fixed, setOptions for inherited after all */
+        $this->setOptions($this->gsid);
     }