Fixed Yay! (maybe)