improve yoda
fix #132