Fix to correctly identify remote IP address and host name when using