Fixing paths on path change