Fix the SelectionHandler bug