Fixed the back-tracking bug. I'm 99% sure he's back to normal now.
Merge branch 'PrettyPrettyTymko'