Pretty huge bug fix (v1.2.2)

I'm so dumb