Bugfix: need to recalculate fpath earlier