Hopefully fix phantom Yo problem