Fixing issue with multiple IP addresses