Midnight commit to fix notifications logic