Fix any path expansion #671