fixed some bug
Revert "fixed some bug"

This reverts commit 2927b3a5f54e57732384123ec82a07834ff1b778.
Revert "Revert "fixed some bug""

This reverts commit 041731fac7dbd8abd471249817d9ab5e5be8f8b4.
some fix