Fixed Listener Bug