Fix connection order