Fixed bug in Xconnect