Changed references from path to fpath