Ensure consistency