Merge: Basename fix