Fixed Listener Bugs