diff --git a/Gii/Gii.php b/Gii/Gii.php
index 5286d8c9..cb317555 100644
--- a/Gii/Gii.php
+++ b/Gii/Gii.php
@@ -130,10 +130,10 @@ class Gii
 		foreach ($tables as $key => $val) {
 			$data = $this->createModelFile($key, $val);
 			if ($controller == 1) {
-				$fileList[] = $this->generateModel($data);
+				$fileList[] = $this->generateController($data);
 			}
 			if ($model == 1) {
-				$fileList[] = $this->generateController($data);
+				$fileList[] = $this->generateModel($data);
 			}
 		}
 		return $fileList;