A little refactor and fix for fake notification

No match.