Move path decode to proper place.