Basename fix