Another fix for IP matching