Fixed the problem with the KAF/NAF identifiers