Fixed deselect issue