Fixed bugs 8