Fix for nonscalar complex properties bug with exportEntities