fixed multiple notification problems