Fixed notification msg generation flaw