Revert "some fixed"

This reverts commit 20bd25feec9b0aca219e4d428af00ae62a2deabc.