fixed double notifications