Custom notification fix