Fix bug that would not pick up node by id in some cases