fix some yokunai code