Fix write-pass re-start while in an active write-pass