Squashed a major bug for real this time!

Didn't work last time :(