OK I actually fixed it this time

~I make too many commits~