Definite fix for double notifications