Fixed bugs 10