Fix eventual consistency