Fix notify listener