Fix to always use full paths