Fix issue with multiple files with same name