Fixing carrier switch detection.