Revert "Bug fixing"

This reverts commit 04683d12ed4101d3e5da974f5758e516e39afc99.