diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5842e962fc..62220b2b50 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/06/07
+	* [Optimized]:
+	  - list and size not being initialized (size get intialized in default: switch case)
+	    Eliminated default case and initialized list and size at the beginning. [Lance]
 2006/06/06
 	* Hopefully fixed for sure mobs getting extra stats when changing-class due
 	  to the mobs level up setting. [Skotlex]
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 5077045234..4b5e2be592 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2837,8 +2837,8 @@ int parse_frommap(int fd) {
 				int fame = RFIFOL(fd, 6);
 				char type = RFIFOB(fd, 10);
 				char pos = RFIFOB(fd, 11);
-				int size;
-				struct fame_list *list;
+				int size = 0;
+				struct fame_list *list = NULL;
 				RFIFOSKIP(fd,12);
 				
 				switch(type) {
@@ -2854,9 +2854,6 @@ int parse_frommap(int fd) {
 						size = fame_list_size_taekwon;
 						list = taekwon_fame_list;
 						break;
-					default:
-						size = 0;
-						break;
 				}
 				if(!size) break; //No list.
 				if(pos)