diff --git a/src/main/java/com/p2sdev/jsonToOrmMapper/mapper/orm/DjangoModel.java b/src/main/java/com/p2sdev/jsonToOrmMapper/mapper/orm/DjangoModel.java
index 576b899..67723e7 100644
--- a/src/main/java/com/p2sdev/jsonToOrmMapper/mapper/orm/DjangoModel.java
+++ b/src/main/java/com/p2sdev/jsonToOrmMapper/mapper/orm/DjangoModel.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import com.p2sdev.jsonToOrmMapper.enums.JSONTypes;
 import com.p2sdev.jsonToOrmMapper.convert.Table;
@@ -79,7 +80,7 @@ private void buildClass(Table table) {
 			.append(Model.PRIMARY_KEY.getValue())
 			.append("\n\t");
 		
-		Map<String, JSONTypes> tableColumnsDef = table.getTableColumnsDef();
+		Map<String, JSONTypes> tableColumnsDef = new TreeMap<>(table.getTableColumnsDef());
 		
 		for(String key : tableColumnsDef.keySet()) {
 			switch(tableColumnsDef.get(key)) {
diff --git a/src/test/java/com/p2sdev/jsonToOrmMapper/AppTest.java b/src/test/java/com/p2sdev/jsonToOrmMapper/AppTest.java
index e93a7c6..94b4c7d 100644
--- a/src/test/java/com/p2sdev/jsonToOrmMapper/AppTest.java
+++ b/src/test/java/com/p2sdev/jsonToOrmMapper/AppTest.java
@@ -63,8 +63,8 @@ public void testValidJSONObject() {
                 " Person(models.Model):" +
                 "person_id = models.AutoField(primary_key=True)" +
                 "f_name = models.CharField(max_length=100)" +
-                "p_id = models.IntegerField()" +
-                "l_name = models.CharField(max_length=100)";
+                "l_name = models.CharField(max_length=100)" +
+                "p_id = models.IntegerField()";
     	
     	expected = expected.replaceAll("\\n|\\r\\n|\\r|\\t", "");