Parsing to KAF/NAF bugfix