partial fix of the NAT troubles