Prevent conflicts (even if it happens rarely)