yay for happy fixes