some some bugs fix