Fixed Listener memory leak