Unchanged patch to solve replication problem.