Minor change to use node ids not in order