1.1.11: fixed cases where connecting went wrong