Bug 143: Fixed split-brain issue