Bug fix for nil notification