Fixed soundness issue in shift/reset