Partially fix built-in selection