Fixed up node context binding