Attempt to fix pipelining issue