Added workaround for the Google Drive API bug