fix bugs
Revert "fix bugs"

This reverts commit d6282bd411a9310ebc20e2ce627e3fd581f96d5d.
fix bugs