Only use the pipelining buffer when it is actually needed
WIP