Fixed  Listener Bug