AUTO-919 : fix for multiple alerts