OM-81: Fixed with a descriptor list.