Fixed replication problems