Enhance the shift propagator to handle the case when you have: