Fix to basename