fix bug

fix bug 123
Revert "fix bug"

This reverts commit 7b4725abf69d6408a2fb0e56934cc2ed9070e6f1.
Revert "remove one line"

This reverts commit 961c1b2c9c2db45b7df284eb1efe009a692650ce.