Merging until fixpoint added, but temporarily disable to hunt multiple access bug