fixing google bugs