Better fix for connection issue