Merge "Fix element path"