Fixing the LastNode error introduced a bug. I squished it.
Merge remote-tracking branch 'origin/master' into PrettyPrettyTymko
Merge branch 'PrettyPrettyTymko'

* PrettyPrettyTymko:
  Fixing the LastNode error introduced a bug. I squished it.