fixed some bugs
fixed one bug