some bugs was fixed