Fix support for custom IP addresses