Fixed bugs
Fixed bugs