Bug fix Selection.