Fixed bugs 2