essentially the same as the previous patch but considers the case when the "long" line appears in the context
essentially the same as the previous patch but considers the case when the "long" line appears in the context