Yo + fix server side