better handling of alert mode