ExternalConnection fix.