Fixed listener registration