Added check to ensure configuration remains consistent