yay fixing