Bug fixes with overlapping phrases at start