Fixed connectivity bug