some bad changes, fix  that