properly selecting
scripted update of code from master at c9b1dce properly selecting