Fix for issue #762 - Handle Complex part with non-complex parent entity