Simple parser for CNB - fix