Fixed bugs 4