GS-11327 changed deselect implementation