Fix propagation issue