Bug#6150 double notification in some case
Merge pull request #192 from vigov5/bug#6150

Bug#6150 double notification in some case