fix double event calls in SelectionHandler #5