Fixed issue when saving replicated entries