Do we need an expand_path here ?