Fix bugs on Chrome & Firefox