Finally fixed the bad changes that I pushed 4 commits ago