Fix the rest of the f*cking bug