Fix again multiple selection