Fixed double notifications