diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 4b33bbd4c6..6de833aeb4 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -353,7 +353,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 	_silent = false;
 	_amp->apply_gain_automation(false);
 
-	BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers ());
+	BufferSet& bufs = _session.get_route_buffers (n_process_buffers ());
 
 	fill_buffers_with_input (bufs, _input, nframes);
 	
diff --git a/libs/ardour/process_thread.cc b/libs/ardour/process_thread.cc
index 2ffb47a0df..4c9789f37a 100644
--- a/libs/ardour/process_thread.cc
+++ b/libs/ardour/process_thread.cc
@@ -114,7 +114,7 @@ ProcessThread::get_route_buffers (ChanCount count, bool silence)
 	ThreadBuffers* tb = _private_thread_buffers.get();
 	assert (tb);
 
-	BufferSet* sb = tb->scratch_buffers;
+	BufferSet* sb = tb->route_buffers;
 	assert (sb);
 
 	if (count != ChanCount::ZERO) {