Rollback - fix detach blocks