fixed regression causing many test failures from previous fix
fixed regression causing many test failures from previous fix

sb43/bpipe,vivovip/bpipe,tucano/bpipe,vivovip/bpipe,vivovip/bpipe,sb43/bpipe,tucano/bpipe,sb43/bpipe,tucano/bpipe