NM: change 7804 and source