Fix for pipeline propagation #302