Fix for changes from google