rebuildPath fix was incomplete.  apply same fix to goal node.
Merge branch 'bug-fix'.  complete rebuildPath fix