Fixed bugs 9