Improved previous fix to facilitate future support for PIPELINING