Force the descriptors to the right type for the field they're referencing. Fixes
the sand issue