Proper schema disagreement fix