Fix trait selection.