diff --git a/core/logic/FrameIterator.cpp b/core/logic/FrameIterator.cpp
index f2a939c0..0c91db25 100644
--- a/core/logic/FrameIterator.cpp
+++ b/core/logic/FrameIterator.cpp
@@ -46,18 +46,13 @@ SafeFrameIterator::SafeFrameIterator(IFrameIterator *it)
 
 bool SafeFrameIterator::Done() const
 {
-	return current == frames.length();
+	return current >= frames.length();
 }
 
 bool SafeFrameIterator::Next()
 {
-	if (!this->Done())
-	{
-		current++;
-		return true;
-	}
-	
-	return false;
+	current++;
+	return !this->Done();
 }
 
 void SafeFrameIterator::Reset()