NAT for airline flight numbers would fix this problem and improve security to boot!