Revert "bug fix#1"

This reverts commit 2a779285ea2cd2db9de49c95a78769bdef7d0c4a.
Revert "Revert "bug fix#1""

This reverts commit d5c9a32a21308851a1d898e0e6b810229229f6af.