Additional fixed on GDrive implementaiton