Fixing ambiguos switch