Revert "Bug revise"

This reverts commit 85d7f04c31c30215ec6aa3ab8d73aac0f5bc35ee.