Fix to handle multiple connection