Revert "Add some fix code"

This reverts commit 39c9c44b9a33a242f376724e28eeb55c725f826e.
Add another fix code