fix bugs
all