Fixes embedded objects sometimes forcing the first type to be selected automatically.