Switch to need_fullpath=false