fixed bugs
Fixed bugs