fixed Yo issues