diff -r 9b6d3ca0c601 -r 16aa830c86c8 bthci/hci2implementations/CommandsEvents/symbian/src/switchrolecommand.cpp
--- a/bthci/hci2implementations/CommandsEvents/symbian/src/switchrolecommand.cpp	Wed Mar 31 23:19:43 2010 +0300
+++ b/bthci/hci2implementations/CommandsEvents/symbian/src/switchrolecommand.cpp	Wed Apr 14 17:08:52 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -12,7 +12,7 @@
 //
 // Description:
 // This file was generated automatically from the template commandsource.tmpl
-// on Thu, 29 May 2008 15:17:48 (time stamp)
+// on Fri, 26 Mar 2010 16:16:13 (time stamp)
 // 
 //
 
@@ -81,9 +81,13 @@
 	{
 	if (aEvent.EventCode() == ERoleChangeEvent)
 		{
-		aMatchesCmd = ETrue;
-		aConcludesCmd = ETrue;
-		aContinueMatching = EFalse;
+		TRoleChangeEvent& event = TRoleChangeEvent::Cast(aEvent);
+		if (event.BDADDR() == BDADDR())
+			{
+			aMatchesCmd = ETrue;
+			aConcludesCmd = ETrue;
+			aContinueMatching = EFalse;
+			}
 		}
 	// Command Status Event and default Command Complete Event matching
 	// is implemented in the base class.  If we haven't matched already