Move ipaddress workaround to a differente place