fix for issue "Double notification #29"