VOM: Fix state reconciliation