Added fix for replication to core controller