Revert "fix"

This reverts commit d4c54f7601b2fb4b6aab53f55170ea54c1202ff0.
fixed some bugs