First path fix