Better handling of path