Fixed bugs
fix