BugFix for extraFields returning non-array