Code added to use adjusted current node in parser