Bugfix: Connection