Fix pairing issue with iOS 7.1.1 and XE 17.1