fixed issues when uploading all