Fix issue with multiple OriginalFile objects with same path and name