Bug fix/selection

test