Bugfix to connectivity