bugfix in cnf
merge from dev: bugfix in cnf