implement fix for Google API