Need fix on remove Listener