Revert "fixed some bug"

This reverts commit 9d0b093964da68dff134904d9d67875e7de24c57.