Fix to selection