Fixed listener handling