diff --git a/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java b/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
index e65b1341993a279af2a18ffe78e9996c2266acb6..7a67f3bccb6e25bf9d71fda92202713af1400d1f 100755
--- a/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
+++ b/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
@@ -475,47 +475,30 @@ public class Client
                                     	System.out.println("##### Client member_add_file_data");
                                         listener.conferenceEventPlayFile(uniqueId, confName, confSize, event);
                                         return;
-                                    } else if (eventFunc.equals("conf_api_sub_transfer")) {
-                                        //Member transfered to another conf...
-                                        listener.conferenceEventTransfer(uniqueId, confName, confSize, event);
-                                        return;
                                     //API has changed between freeswitch 1.4 and 1.6
-                                    } else if (eventFunc.equals("conference_api_sub_transfer")) {
+                                    } else if (eventFunc.equals("conf_api_sub_transfer") || eventFunc.equals("conference_api_sub_transfer")) {
                                         //Member transfered to another conf...
                                         listener.conferenceEventTransfer(uniqueId, confName, confSize, event);
                                         return;
-                                    } else if (eventFunc.equals("conference_add_member")) {
+                                    //API has changed between freeswitch 1.4 and 1.6
+                                    } else if (eventFunc.equals("conference_add_member") || eventFunc.equals("conference_member_add")) {
                                     	System.out.println("##### Client conference_add_member");
                                         listener.conferenceEventJoin(uniqueId, confName, confSize, event);
                                         return;
                                     //API has changed between freeswitch 1.4 and 1.6
-                                    } else if (eventFunc.equals("conference_member_add")) {
-                                        System.out.println("##### Client conference_member_add");
-                                        listener.conferenceEventJoin(uniqueId, confName, confSize, event);
-                                        return;
-                                    } else if (eventFunc.equals("conference_del_member")) {
+                                    } else if (eventFunc.equals("conference_del_member") || eventFunc.equals("conference_member_del")) {
                                     	System.out.println("##### Client conference_del_member");
                                         listener.conferenceEventLeave(uniqueId, confName, confSize, event);
                                         return;
                                     //API has changed between freeswitch 1.4 and 1.6
-                                    } else if (eventFunc.equals("conference_member_del")) {
-                                        System.out.println("##### Client conference_member_del");
-                                        listener.conferenceEventLeave(uniqueId, confName, confSize, event);
-                                        return;
-                                    } else if (eventFunc.equals("conf_api_sub_mute")) {
+                                    } else if (eventFunc.equals("conf_api_sub_mute") || eventFunc.equals("conference_api_sub_mute")) {
                                         listener.conferenceEventMute(uniqueId, confName, confSize, event);
                                         return;
                                     //API has changed between freeswitch 1.4 and 1.6
-                                    } else if (eventFunc.equals("conference_api_sub_mute")) {
-                                        listener.conferenceEventMute(uniqueId, confName, confSize, event);
-                                        return;
-                                    } else if (eventFunc.equals("conf_api_sub_unmute")) {
+                                    } else if (eventFunc.equals("conf_api_sub_unmute") || eventFunc.equals("conference_api_sub_unmute")) {
                                         listener.conferenceEventUnMute(uniqueId, confName, confSize, event);
                                         return;
                                     //API has changed between freeswitch 1.4 and 1.6
-                                    } else if (eventFunc.equals("conference_api_sub_unmute")) {
-                                        listener.conferenceEventUnMute(uniqueId, confName, confSize, event);
-                                        return;
                                     } else if (eventFunc.equals("conference_record_thread_run")) {
                                     	System.out.println("##### Client conference_record_thread_run");
                                         listener.conferenceEventRecord(uniqueId, confName, confSize, event);