Path fixing, attempt 2