diff --git a/Changelog.txt b/Changelog.txt
index fb712e8e3e..69efc561fe 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
 Date	Added
 11/21
+	* Closed AFM files after reading, this fixed the improper char-server session #. [Valaris]
         * Skill updates: [Celest]
           - Updated Basilica, Sharp Shooting, Berserk, Meditatio (Thanks to DracoRPG!)
           - Fixed a typo with Blade Stop that was causing crashes, sorry. ^^;
diff --git a/src/map/map.c b/src/map/map.c
index b47c7786af..8bf0c74f63 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1480,6 +1480,9 @@ static int map_readafm(int m,char *fn) {
 	afm_file = fopen(fn, "r");
 	if (afm_file != NULL) {
 			
+		printf("\rLoading Maps [%d/%d]: %-50s  ",m,map_num,fn);
+		fflush(stdout);
+
 		str=fgets(afm_line, sizeof(afm_line)-1, afm_file);
 		str=fgets(afm_line, sizeof(afm_line)-1, afm_file);
 		str=fgets(afm_line, sizeof(afm_line)-1, afm_file);
@@ -1541,7 +1544,11 @@ static int map_readafm(int m,char *fn) {
 		memset(map[m].block_mob_count,0,size);
 
 		strdb_insert(map_db,map[m].name,&map[m]);
+
+		fclose(afm_file);
+
 	}
+
 	return 0;
 }