Revert "修正 bug #7, #2"

This reverts commit b5bb2388e0d197a9e6a466c405a6ba4e1e937e72.
Revert "Revert "修正 bug #7, #2""

This reverts commit df544aebd4846e780a99cf680ff446008f6f3518.