Fixed bugs 11