Fixes on notification always shown