Fixed bugs for Chrome