fixed some bugs'