connection bug fix