[3.8] Fix notification use