fixed maintaining selection