diff -r 16aa830c86c8 -r f8503e232b0c bluetooth/btstack/linkmgr/physicallinks.cpp
--- a/bluetooth/btstack/linkmgr/physicallinks.cpp	Wed Apr 14 17:08:52 2010 +0300
+++ b/bluetooth/btstack/linkmgr/physicallinks.cpp	Tue Apr 27 17:48:21 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"
@@ -2821,11 +2821,12 @@
 		}
 
 	TBTPinCode pinCode;
-	if(iLinksMan.PrefetchMan().IsPrefetchAvailable(aAddr, pinCode))
-		{
-		aRequester.PINCodeRequestReply(aAddr, pinCode);
-		return;
-		}
+	if(iLinksMan.PrefetchMan().GetPrefetch(aAddr, pinCode))
+	    {
+        iLinksMan.PrefetchMan().RemovePrefetch(aAddr);
+        aRequester.PINCodeRequestReply(aAddr, pinCode);
+        return;
+	    }
 
 	iPinHandler = &aRequester;