Stupid halfway fix, now it's fully fixed