Fix mess with Yo