Fix due to new Path Class in PAT