fixed the listeners