Fixed listener version