diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index 6097c69489..6802d7b474 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -1310,7 +1310,7 @@ vector<RString> TimingData::ToVectorString(TimingSegmentType tst,
 		if (tst == SEGMENT_STOP_DELAY)
 		{
 			StopSegment *seg = static_cast<StopSegment *>(segs[i]);
-			if (seg->GetDelay() == isDelay)
+			if (seg->GetDelay() != isDelay)
 				continue;
 		}
 		ret.push_back(segs[i]->ToString(dec));
diff --git a/src/TimingSegments.h b/src/TimingSegments.h
index bb07e2f7c7..b8f954d467 100644
--- a/src/TimingSegments.h
+++ b/src/TimingSegments.h
@@ -943,7 +943,7 @@ struct StopSegment : public TimingSegment
 	{
 		const RString str = "%.0" + IntToString(dec)
 		+ "f=%.0" + IntToString(dec) + "f";
-		return ssprintf(str.c_str(), this->GetPause());
+		return ssprintf(str.c_str(), this->GetBeat(), this->GetPause());
 	}
 
 	/**