Preserve path and limit unintended paths