Fix uploading multiple files with the same name

Fix uploading multiple files with the same name #1866