fix bugs
fixed bugs