Add a basename() call, just to be sure