adding shortcircuite when there is a replication happening