Also take care of the listener