Fix in structural pipeline