Fix alert on ignored messages, Remove redundancy