fix somethings
Revert "fix somethings"

This reverts commit 1177043cff1e7e8359a8435311a783278b23c90d.
Merge remote-tracking branch 'origin/master'