Resolves #3. Fixes native client connections.