Fixed bugs 5