Fixing connection bug!