diff --git a/include/courtroom.h b/include/courtroom.h
index 30c3b94..74374c9 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -77,6 +77,8 @@ public:
   void append_evidence(evi_type p_evi){evidence_list.append(p_evi);}
   void append_music(QString f_music){music_list.append(f_music);}
   void append_area(QString f_area){area_list.append(f_area);}
+  void clear_music(){music_list.clear();}
+  void clear_areas(){area_list.clear();}
   void handle_failed_login();
   QString threading_sfx = "";
   QString threading_shake = "";
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 7f5d911..8592d4f 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1108,9 +1108,9 @@ void Courtroom::list_areas()
   for (int n_area = 0 ; n_area < area_list.size() ; ++n_area)
   {
     QString i_area = "";
-    i_area.append("[");
-    i_area.append(QString::number(n_area));
-    i_area.append("] ");
+//    i_area.append("[");
+//    i_area.append(QString::number(n_area));
+//    i_area.append("] ");
 
     i_area.append(area_list.at(n_area));
 
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 9f072ae..b14cd57 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -515,11 +515,14 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     send_server_packet(new AOPacket("RM#%"));
   }
-  else if (header == "SM")
+  else if (header == "SM" || header == "FM")
   {
       if (!courtroom_constructed)
             goto end;
 
+      w_courtroom->clear_music();
+      w_courtroom->clear_areas();
+
           bool musiclist_start = false;
           area_count = 0;
 
@@ -543,8 +546,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
             }
           }
           QThreadPool::globalInstance()->waitForDone();
-
-          send_server_packet(new AOPacket("RD#%"));
+          if (header == "SM")
+            send_server_packet(new AOPacket("RD#%"));
   }
   else if (header == "DONE")
   {