Potential fix for connection instability