current_listener fix