Make work without txn_context=