Fixed listener detection.