Fix to use globalListener properly.