Use expand-file-name instead of concat