add replication workaround