Revert "bug fixing"

This reverts commit 749674226d14ccbac8521b1cd73efc0b87d41d20.