fixed the final notification issue