Afsin issue 133 (node code change/test only)