Bug fixing
Revert "Bug fixing"

This reverts commit 47fbb9d8608ce2de9a9bb159d6f18790fcc1a271.