diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
index 3e548d42..f10b3597 100644
--- a/src/FrameMapper.cpp
+++ b/src/FrameMapper.cpp
@@ -346,7 +346,7 @@ tr1::shared_ptr<Frame> FrameMapper::GetOrCreateFrame(long int number)
 	tr1::shared_ptr<Frame> new_frame;
 
 	// Init some basic properties about this frame (keep sample rate and # channels the same as the original reader for now)
-	int samples_in_frame = Frame::GetSamplesPerFrame(number, target, reader->info.sample_rate, reader->info.channels);
+	int samples_in_frame = Frame::GetSamplesPerFrame(number + timeline_frame_offset, target, reader->info.sample_rate, reader->info.channels);
 
 	try {
 		// Debug output
diff --git a/src/Timeline.cpp b/src/Timeline.cpp
index 28aec740..7a36174e 100644
--- a/src/Timeline.cpp
+++ b/src/Timeline.cpp
@@ -130,6 +130,11 @@ void Timeline::apply_mapper_to_clip(Clip* clip)
 	// Update timeline offset
 	float time_diff = 0 - clip->Position() + clip->Start();
 	int clip_offset = -round(time_diff * info.fps.ToFloat());
+
+	if (clip_offset != 0)
+		// Reduce negative offset by 1 (since we want to avoid frame 0)
+		clip_offset += 1;
+
 	clip_mapped_reader->SetTimelineFrameOffset(clip_offset);
 
 	// Update clip reader