Correcting conditions on the listeners.