Revert "fix a bug"

This reverts commit 1aafcf5185f5fa856336c413833425199c7ceaf1.
Revert "Revert "fix a bug""

This reverts commit 7a5cf3a0e26c2ff4ec3f251e9d5025ae698937cd.