No more hanging when pressing connect (tested on BBB)