hotfix: handle extra field