Yay, it's not broken anymore