Selection and small fix