Fix connecting issue