Fix detach blocks in Rollback