rollback + fix