Revert "Bug fixing"

This reverts commit f59322f3ab35233a6b6e15b721902eb6595929dd.