Incorrect selection listener disposement fixed