Fix repeated alert messages