Fix Listeners not working