Fixed Listener bug