Fix duplicated notifications

@andresamayadiaz - Here's the fix for problem with duplicated notifications error earlier we have found. Please review.