Fix propagation for non-matched cases