Finally fixed, hopefully doesn't break anyone else