Try a fix for #435

In the ORM this logic makes sense but in the ODM we can change types and store different types in fields per document.