Fixing the listeners

Listeners were registered wrongly.