fix conflicting switch