Fixed ASN handling -again-