Attempting to fix connection hang