fix bugs
merged